Merge "Fix not to launch MusicActivity directly" am: efc6aa2c1f
am: 82655c7f88

Change-Id: I84436c0c4446c045ad08b4a98772cdc2d6aa98d1
tree: d526598327697d7fc283e943e1e8df53b77e504b
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS