Merge "Don't auto backup for MusicFX app" am: a015510a46
am: 383b25e0b7

Change-Id: I1f27142f0b652f082299d4be095c2f2bdfbe7188