Merge changes from topic "am-93e91d83a9c14e148b5a0e6789a4a3d6" into...

Merge changes from topic "am-93e91d83a9c14e148b5a0e6789a4a3d6" into tm-d1-dev-plus-aosp am: 7acea151 am: 50770dd6

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



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