am a96040a7: am d07f8d0b: Merge "Re-fixing content descritpion on quick settings toggle. Bug: 7362316" into jb-mr1-dev

* commit 'a96040a7d447382a2477df4f5a91b8319c3b6545':
  Re-fixing content descritpion on quick settings toggle. Bug: 7362316