Merge "Merge "To fix testAudioRoute fail" into pie-cts-dev am: 1547a99939"
am: 825604fa6d

Change-Id: I7c04272beb0222821ba048523c28f61d9d27aa08