Merge changes from topic "am-9a330cf445974a4aab7413ae6037f883" into...

Merge changes from topic "am-9a330cf445974a4aab7413ae6037f883" into tm-d1-dev-plus-aosp am: 50a21b74 am: 500208e2

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



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