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

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

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



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