Merge changes from topic "am-40bed6161b4d4ad69b276c380d19e8bf" into...

Merge changes from topic "am-40bed6161b4d4ad69b276c380d19e8bf" into tm-d1-dev-plus-aosp am: 27af6b06 am: 62683f4a

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



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