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

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

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



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