Merge "Skip bg PSS collection for apps using a camera am: fc76b97d1b am: 9e4c36f7e1" into rvc-d1-dev-plus-aosp am: 7d6a158b8e

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

Change-Id: I20b319a7d01fd68ba2f4a1213874fd4c37aed2bb