Merge "Merge "Update location icons (qs + status)" into pi-dev am: 478923bd" into pi-dev-plus-aosp am: f4381335 Change-Id: I8eb61c9400da2db19f94972d3fc86c3cee69d6f3