[automerger skipped] Merge "Check location permission for ConnDiags last." into sc-dev am: 424e2ef3aa -s ours am: e41bdecdb1 -s ours

am skip reason: Merged-In I2dbeddac6273e2392ccaeae51a1c7776d6d3da75 with SHA-1 0b4be0203d is already in history

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

Change-Id: Iba94adfb3713288c908000248571f188750618ec
tree: 2edfae70528ad60e96420bb8a11cfb82ead90366
  1. framework/
  2. service/
  3. tests/
  4. OWNERS
  5. TEST_MAPPING