Merge changes I2d6bb0c1,Iedc23f15

* changes:
  Revert "Cache results of isLocationEnabledForUser calls"
  Revert "Cache results of getProfileParent calls"