[automerger skipped] Merge changes from topic "cherrypicker-L22000000959901080:N28400001357657640" into sc-qpr1-dev am: 7fdc711ced am: cf8dcd2832 am: f2e055c735 am: 406e60c8bd am: 3df4f88366 am: df75c62f92 -s ours am: 343d95beb6 -s ours am: d33b36e398 -s ours

am skip reason: Merged-In Ib2d5400e930fa4d6f7f98e46f32a290ba5f558f4 with SHA-1 48fa9bef34 is already in history

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

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