Merge "Make location QuickSettings multi-user compatible (b/10563313)" into klp-dev