[automerger skipped] Merge "Add updatable_media_stub to framework" am: f3273c5587 am: 833f84dff8 am: 7895a0b43e -s ours
am skip reason: Change-Id I7f80716119ad6ac627e5666def9fe17112dcde3b with SHA-1 4c258d282b is in history

Change-Id: Icdac0464e4be9a476f0b95fb53078f96880a859c