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

Change-Id: I3f3fd27441b3c5b371fb32c3f0837c9466ac0530