[automerger skipped] Merge "Configure privapp perms for rotary service" into...

[automerger skipped] Merge "Configure privapp perms for rotary service" into rvc-qpr-dev am: 43c4add7 am: c4090831 -s ours

am skip reason: Change-Id Ib0596f87c81fda75c830989ecc57059392b7fc42 with SHA-1 ffe2cfcf is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I62107cfa5c0cab45c87ac9f632f8476ec11d22fb