Merge changes from topic "am-99e33d185d7f4240849743d5d7f8a703" into tm-dev am:...

Merge changes from topic "am-99e33d185d7f4240849743d5d7f8a703" into tm-dev am: c8734dcf am: c9df6d5b

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



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