Merge "Skip bg PSS collection for apps using a camera am: fc76b97d am: 9e4c36f7" into rvc-d1-dev-plus-aosp