Merge "Tweak stubs for updatable media" am: 2c99ff0042

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

Change-Id: I4076ae331cfc6b752857b139853ec1befebba06c