Merge "DO NOT MERGE Rework Device Monitoring Dialog in Quicksettings" into nyc-mr2-dev am: 4d3aa8e8ab
am: 4e02b89a1e  -s ours

Change-Id: I88665a96717871a0a989ae69a840e1af62ce5b11