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

Merge changes from topic "am-e791bbf3990a436cbdcca338a885ae31" into tm-d1-dev-plus-aosp am: 25b7a280

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



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