Merge changes from topic "am-9fa7d80b21934066ba9777d72c99d3a2" into...

Merge changes from topic "am-9fa7d80b21934066ba9777d72c99d3a2" into tm-d1-dev-plus-aosp am: 3e0442d6

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



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