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

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

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



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