[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypick-SPOOF_PACKAGE_NAME-zoqa9prsry" into sc-qpr1-dev am: 16f330db -s ours am: dc46b391 -s ours am: 443fce4c -s ours am: 50b3cb43 -s ours am: 9db44001 -s ours am: 302dce61 -s ours

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

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



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