Merge "Support auto-downgrade to audio when data disabled." into nyc-mr1-dev am: 76c973cda0
am: 464eb12320

Change-Id: Ibab9f79cfb09cb41e56c549549539eaffb16bcb2