[automerger skipped] Merge "Revert "A simple music app that passes CTS tests.""
am: b5ac8a91b4  -s ours

Change-Id: I6cd99fbdccd88d1f921c65ecc8ca6c880a09ec0f