Merge "Check location permission for ConnDiags last." am: c5f9939bf3 am: 7cc1a8b2e7

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

Change-Id: I6ca0b27d9280e9246fbf6ea105f18d6f1d073388
tree: 1969daacbf5ef4563b300874e40534ec512f527a
  1. framework/
  2. service/
  3. tests/
  4. OWNERS
  5. TEST_MAPPING