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

Merge changes from topic "am-2c16bf37383c453a942af19dc474b937" into tm-d1-dev-plus-aosp am: e7bcc47e -s ours

am skip reason: Merged-In Ic2fa8f06cc7a4c1f262115764fbd1be2a226b4b9 with SHA-1 80c0fcf0 is already in history

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



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