Merge changes from topic "am-2a732d146e1f4618a3e6cdeb10fb716a" into...

Merge changes from topic "am-2a732d146e1f4618a3e6cdeb10fb716a" into tm-qpr-dev-plus-aosp am: 1c77e3d8 -s ours

am skip reason: Merged-In I68f2f37b5ce835e7fd8649b382eaee9fc299ec79 with SHA-1 c5e8f7f5 is already in history

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



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