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

Change-Id: Ib89b1893125b9378367baf06dd10ee4c92b7392e