Merge changes from topic "am-0af370f6b33542b09d673716bbc90c20" into tm-d1-dev-plus-aosp am: 7f395613 am: ed5ffbcf

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



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