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