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

[automerger skipped] Merge "Condition background record restriction on Sdk" into tm-dev am: afabc9ca am: 6d347775 am: 2a7629c7 -s ours am: bfce3f12 -s ours am: 9ce21384 -s ours

am skip reason: Merged-In I42b6cbca60db6ce1a073254239b48e9104c4ebfb with SHA-1 3de585db is already in history

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



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