Merge "Check location permission for ConnDiags last." am: c5f9939bf3

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

Change-Id: Idfea26523ff297f8be22695dd5a4e5351a7ccda4