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

am skip reason: Merged-In I2dbeddac6273e2392ccaeae51a1c7776d6d3da75 with SHA-1 8533f883c2 is already in history

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

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