[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypick-SPOOF_PACKAGE_NAME-zoqa9prsry" into sc-mainline-prod am: 05688a7e -s ours am: 4bb48591 -s ours am: 4874a851 -s ours am: 04823598 -s ours

am skip reason: Merged-In Ic14fc331a9b5fbdbcfe6e54a31c8b765513bfd89 with SHA-1 eef20391 is already in history

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



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