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

Merge changes from topic "am-c036cb8107fa4697ae97e16bc8c57a94" into tm-d1-dev-plus-aosp am: ff9fe515 am: 4d6d78e7

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



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