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

Change-Id: Ia0b1dbb199033513041b1a605e91cf3a4260e24d