Merge "Send broadcast when location mode is about to change DO NOT MERGE" am: 1c05be48ae
-s ours am: 5c50b5362b
am: bfc6983947
-s ours
Change-Id: Ieb432ef40528554abbe69f709b83c4180dbc2e4f
This commit is contained in: