Merge changes from topic "am-28212c0c6de44616b530d551080b64df" into...

Merge changes from topic "am-28212c0c6de44616b530d551080b64df" into tm-d1-dev-plus-aosp am: 518eafba

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



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