[automerger skipped] Merge "Check location permission for ConnDiags last." into sc-dev am: eae314a688 -s ours am: 4a52e56c0f -s ours
am skip reason: Merged-In I2dbeddac6273e2392ccaeae51a1c7776d6d3da75 with SHA-1 314ff0dc82 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14676745
Change-Id: Iba94adfb3713288c908000248571f188750618ec
This commit is contained in: