DO NOT MERGE Rework Device Monitoring Dialog in Quicksettings am: 2f512047c2
am: ccf8d9e9cf  -s ours

Change-Id: I02b79b28d9d25834f6fe2e67b3cbea94bb0fc084