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

Merge changes from topic "am-e715a9f74b274f7bbaa4c61deb13b187" into tm-d1-dev-plus-aosp am: 224299a6

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



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