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

Change-Id: I0b78ebbfe10a56d2ce27af0b9317de93e29e4c13