[automerger skipped] Merge "Merge "Correct visibility for LOCATION_MODE_ON"...
[automerger skipped] Merge "Merge "Correct visibility for LOCATION_MODE_ON" into qt-dev am: ec554bdd" into qt-dev-plus-aosp
am: ec673935 -s ours
am skip reason: change_id Iddbea546d1585cb8677c4adb97e465d5ac7a76a4 with SHA1 74491089 is in history
Change-Id: I8a0b3746f1f9be419708b488aee4394180d223e8