Merge "Remove implementation details from media provider hidden api flags" am: 2728de1071 am: b9a626c4f3 am: 15a80464d9

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

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