[automerger skipped] Merge "DO NOT MERGE Let isLocationEnabledForUser() return true location setting" am: a4dac05210 -s ours am: 99d0681a6f -s ours
am: 906f80cb3b -s ours
am skip reason: subject contains skip directive

Change-Id: I71309a24a5af6871512993919567a7a591a28e39