[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-34bb8fca5c144fdeba6f9bd8bec99ea4" into tm-mainline-prod am: 713a0071 -s ours

am skip reason: Merged-In I29bb0ffefd57d577b5abe942e227eb2b5baeab4e with SHA-1 2dcb5a81 is already in history

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

Change-Id: Iee32d501e467fd150017e9baa7254af281f444b7