[automerger skipped] Merge changes from topic "cherrypick-jr-owner-azffbn1bzv"...

[automerger skipped] Merge changes from topic "cherrypick-jr-owner-azffbn1bzv" into rvc-qpr-dev am: 935664ad -s ours am: 46eea361 -s ours am: 2584177a -s ours am: 148ba47a -s ours am: 5e9f5916 -s ours am: dfb11784 -s ours

am skip reason: Merged-In I35daf9a24f546ae25a78a2d841be39072cdc5641 with SHA-1 34f2ef77 is already in history

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



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