[automerger skipped] Merge "Check location permission for ConnDiags last." into sc-dev am: 424e2ef3aa -s ours am: e41bdecdb1 -s ours am: fc6a513c02 -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: I61f9ff4be469c8675fa34604c98f8c580268a396