Merge changes from topic "am-f559995854f54474a1212844e62538fb" into...

Merge changes from topic "am-f559995854f54474a1212844e62538fb" into tm-d1-dev-plus-aosp am: 404e4524 -s ours

am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 c4b2c877 is already in history

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



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