[automerger skipped] Merge changes from topic "b174856119_aosp" am: 53455cd1...

[automerger skipped] Merge changes from topic "b174856119_aosp" am: 53455cd1 am: 600d28c2 am: f621a395 -s ours am: 7c1b2ff5 -s ours

am skip reason: skip tag Change-Id Ib3643adfe18a8c4a54328f5a1737a480ea4cfadd with SHA-1 5fbdc85d is already in history

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

Change-Id: I26fa442df8ae5417b3df396a30b5b7db724bc6ea