[automerger skipped] Merge "Configure privapp perms for car activity resolver"...

[automerger skipped] Merge "Configure privapp perms for car activity resolver" into rvc-qpr-dev am: ad312a6c am: eed3786c -s ours

am skip reason: Change-Id If7e5d48ce5d897a2cd90a02eaeda59e71d164520 with SHA-1 8d9eacea is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3b843fbd3e025f4372e30c4d503886cb611b69cf