Merge changes from topic "am-ea826b05322b4f8d90ab7daede06715d" into...

Merge changes from topic "am-ea826b05322b4f8d90ab7daede06715d" into tm-d1-dev-plus-aosp am: 8ac0eec8

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



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