Merge changes from topic "am-5760149da6b0457982391b0ccd4458ef" into...

Merge changes from topic "am-5760149da6b0457982391b0ccd4458ef" into tm-d1-dev-plus-aosp am: c60293cf

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



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