[automerger skipped] Merge changes from topic "am-242a9b60807641619f7dc590346c6a66" into tm-dev am: bcc20345 -s ours am: 0caea203 -s ours

am skip reason: Merged-In If5ce110b506b6b4229dd6ea5a39542369742bc51 with SHA-1 79f9dd01 is already in history

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

Change-Id: I89e72342aa9f850b7111a87f5f86858ca0938523