Merge "Remove MODULE_LICENSE_APACHE2 from apps/Music" am: 20dfa269dd

Change-Id: I6bf48509accd0fa2907b8569110cfd2807c7ac7a