[automerger skipped] Merge "Mark the MediaProvider apex as updatable." am: 6471882b77 am: 3a70f1a37a -s ours am: d25b137bae -s ours

am skip reason: Change-Id I0f86dd70a22b4d867e87cc6127e8864770868b4e with SHA-1 334d9d608b is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3b0b1a9c447a9afed4374b43230df748d568806c