Merge "Merge " Fix ringer mode tests" into oreo-mr1-cts-dev am: cc967033cf" into pie-cts-dev