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

Change-Id: I475e8e97b761180bc95c79513c9402c75ba8fa10