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

Change-Id: Ie3e765b2be88f06a3c97da4371f87b6c62a87f81