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

Merge changes from topic "am-dba211c3a3964fe59ff416a1b50e630e" into tm-d1-dev-plus-aosp am: 747eff26 -s ours

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

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



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