Merge changes from topic "am-63e0065ed2e145c5997006d1209374f9" into tm-d1-dev-plus-aosp am: 5207d07b am: fdadc83f

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



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