[automerger skipped] Merge "DO NOT MERGE Let isLocationEnabledForUser() return true location setting" am: a4dac05210 -s ours
am: 99d0681a6f -s ours
am skip reason: subject contains skip directive
Change-Id: I330716725c4672c60aaa44c9d5d30a241832a2fa
This commit is contained in: