Merge "[automerger skipped] Merge "Condition background record restriction on...

Merge "[automerger skipped] Merge "Condition background record restriction on Sdk" into udc-dev am: 35a224e0 am: 29b83275 -s ours am: 5c1b444b -s ours" into udc-qpr-dev-plus-aosp am: f0cbc1ec -s ours

am skip reason: Merged-In I42b6cbca60db6ce1a073254239b48e9104c4ebfb with SHA-1 733ab192 is already in history

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



Change-Id: Id84f560f2ee642552a9066591db8417e09b2ebbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>