Merge "Merge "Restore the original volume after running AudioManagerTest." into oreo-cts-dev am: fa98b51ebe" am: 3c18810f03
am: e821df89a8

Change-Id: I8b2dce0b587aac199761a6966828e1b41e54c460