[automerger skipped] Merge "Check location permission for ConnDiags last."...

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

am skip reason: Merged-In I2dbeddac6273e2392ccaeae51a1c7776d6d3da75 with SHA-1 727856cc is already in history

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

Change-Id: I12bf8a6e329e7d3555dd2387419e875f05017128