Merge "More descriptive content description for quick settings toggle. Bug: 7362316 Change-Id: I7829402793e407e7ca483e1de2583df3b6c235bf" into jb-mr1-dev