Merge changes from topic "bug_223376078_sc" into sc-qpr1-dev am: e3cb6ab2bf am: 5550bcbce4 am: d14fd3d36d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20312179 Change-Id: Ifb7ef112dd58150e184ce102539b555f9718d55d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: