Merge changes from topic "am-9245448a62854e9389f901c56a0f0322" into tm-dev am: 44111953

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



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