Merge "Restore the original volume after running AudioManagerTest." into oreo-cts-dev am: fa98b51ebe am: d28770b744
am: a1b5184205

Change-Id: Ie6b3d1afa8eb49651f4f18dc09cb21bb7a7bea92