Merge "Merge "Expose Location toggling logic" into oc-dr1-dev am: 4f0e5f8395
-s ours am: f1398725a8
-s ours" into oc-mr1-dev-plus-aosp
am: ab0fa22e71
-s ours
Change-Id: I6114e3774724de20be3cf3212070afca0ad17ac1
This commit is contained in: