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

Change-Id: Ibba35390892874fc32c0f9cebd50077b617e5e96