Merge "Merge "Non-system camera PPA set by DPC" into rvc-dev am: 9a1619cc...

Merge "Merge "Non-system camera PPA set by DPC" into rvc-dev am: 9a1619cc am: 8976d895" into rvc-d1-dev-plus-aosp am: 8ba4f734 am: 074bae41

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

Change-Id: Ib9fb68592adb767486be35becf73fcff3b80837b