Merge "Cache results of isLocationEnabledForUser calls"
am: 58cf2bebb9

Change-Id: I12d9b000a87bbbf42a08cc0c67ee01693026116f