Merge "Add System Audio Control Test" am: fc391963f3 am: 1811d1f676
am: 31a05da408

Change-Id: I3958e3f7434c766d1597acaaa8c6cd7ca66993c3