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

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



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