[automerger skipped] Merge changes from topic "am-0d6b2b68ff4a4977867fe19106a9b40c" into tm-dev am: 43c52ebc -s ours

am skip reason: Merged-In I7707d01be37582461227edcecf5d559f2019c8a5 with SHA-1 b029b005 is already in history

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

Change-Id: Ia35a68683dd7cfb5baa53be2f73b1eab2d77b710