am cd3fe936: am ca8db073: Merge "Enforce location permission for apps targeting M" into mnc-dev

* commit 'cd3fe936ae13467c87ed7481bf27b87bd2717198':
  Enforce location permission for apps targeting M