[automerger skipped] Merge changes from topic "am-3b8511168dc247ec845162728d3a2591" into tm-dev am: b706d65a -s ours

am skip reason: Merged-In I2eba0a592fa33ed25e1ac3919f1b2631e5db4258 with SHA-1 cdb89505 is already in history

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

Change-Id: I3160a154305075d6f155c4457e5f15759b2ec5d9