Merge "Fix broken colors on some android 11 & 12 devices." into udc-mainline-prod am: 834ee23dbb

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/25518320

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