Merge "Merge "Update location icons (qs + status)" into pi-dev am: 478923bded" into pi-dev-plus-aosp