[automerger skipped] Merge "Add updatable_media_stub to framework" am:...
[automerger skipped] Merge "Add updatable_media_stub to framework" am: f3273c55 am: 833f84df am: 7895a0b4 -s ours
am skip reason: Change-Id I7f80716119ad6ac627e5666def9fe17112dcde3b with SHA-1 4c258d28 is in history
Change-Id: Icdac0464e4be9a476f0b95fb53078f96880a859c