Merge changes from topic "am-5735f3c6a06a464b800f140d76b6f558" into tm-d1-dev-plus-aosp am: d2fe0cbc

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



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