Merge "Check location permission for ConnDiags last." am: 9f74e660cf

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1699069

Change-Id: Idfea26523ff297f8be22695dd5a4e5351a7ccda4
tree: 15efe0b1b13c8dfd51bb47278fffb3e74e52e0fc
  1. framework/
  2. service/
  3. tests/
  4. OWNERS
  5. TEST_MAPPING