[automerger skipped] Merge "Tweak stubs for updatable media" am: 2c99ff00...

[automerger skipped] Merge "Tweak stubs for updatable media" am: 2c99ff00 am: 2b86731b -s ours am: 69acf258 -s ours

am skip reason: Change-Id I498823de7315f78121975d36d6dc7667a8245085 with SHA-1 12a07676 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1402650

Change-Id: I30cadc0348b4c4f188e7dfb69811b7de3194abae