[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypick-cherrypick-jr-owner-azffbn1bzv-wo9su3lsju" into rvc-dev am: 4d015c71 -s ours am: b93dab4b -s ours am: badff388 -s ours

am skip reason: Merged-In I35daf9a24f546ae25a78a2d841be39072cdc5641 with SHA-1 55d8e634 is already in history

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



Change-Id: Ica0e34de6dec41e17ca2d402f9903a6483db028a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>