[automerger skipped] Merge changes from topic "cherrypicker-L30100000958833107:N04600001341391576" into sc-qpr1-dev am: ef1b9f7d -s ours am: dfc830bb -s ours am: 3a383111 -s ours am: 547ea73b -s ours am: 74271ace -s ours am: 4b6026c9 -s ours

am skip reason: Merged-In Ie16f8654337bd75eaad3156817470674b4f0cee3 with SHA-1 1ef76e11 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21614620



Change-Id: Ifbbbcc8e81f5f407fa27ad8fbf2410af5dfe23c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>