[automerger skipped] Merge "RESTRICT AUTOMERGE Manual merge of topic...

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

am skip reason: subject contains skip directive

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

Change-Id: I2f3425a8bced03e599b853a4e168e5d8e2f5f1ba