Merge "Don't acquire audio focus if ringtone will not play" into nyc-mr1-dev
am: 1a80eccb92

Change-Id: Ieac02bbc4e13a3dba198dad4db8c3afdca0781e1