Merge "Avoid media transcode can be bypass guard of developer options" into...

Merge "Avoid media transcode can be bypass guard of developer options" into tm-qpr-dev am: cb27771f am: f39285a7

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20608287



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