am 5b68e4c8: am 741bc054: Merge "Shows LGAAYL when launching Location Settings" into klp-dev

* commit '5b68e4c8d09d9c0cc864e32970c9af925dd0d643':
  Shows LGAAYL when launching Location Settings