Merge "A simple music app that passes CTS tests."
am: 0a3aa657eb

Change-Id: Id740f1f52373dc7d986d35e477d2387aa77df953