Merge \"Optimize audio playback restriction check\" into nyc-mr1-dev
am: 69c6166684

Change-Id: If626176f014e65f0248c5ae80d9196dd27076ec4