Merge changes from topic 'am-0fee4bce4d374519bf38ae18517a4d79' into nyc-mr1-dev-plus-aosp

* changes:
  Merge "Support auto-downgrade to audio when data disabled." into nyc-mr1-dev am: 76c973cda0 am: 464eb12320
  Support auto-downgrade to audio when data disabled. am: 86d5c3fcde am: 6c678716e4