Merge "Merge "Fix AudioRestrictionTest with setting of volume keys for media not Ringtone as default stream." into oreo-mr1-cts-dev am: dbec64c942" into pie-cts-dev