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

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