[automerger skipped] Merge "RESTRICT AUTOMERGE Manual merge of topic art-service-revert" into sc-dev-plus-aosp am: 7191d1fe -s ours am: 43b14211 -s ours

am skip reason: subject contains skip directive

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

Change-Id: If8f2486a9913d6e1c3643b82271228eb19a3e5c7