Merge "Add System Audio Control Test"
am: fc391963f3

Change-Id: I3ccdfd9e3fc8f1602ac374e5a0dfa61e11d4e026