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

Merge changes from topic "am-ff197ea84b5f4bb4aafe357bf04fe940" into tm-d1-dev-plus-aosp am: 72c9a098

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



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