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

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

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



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