Merge "Check location permission for ConnDiags last." am: c5f9939bf3 am: 7cc1a8b2e7 am: 31cee3ca28 am: 9fab646600

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

Change-Id: I1664fd4cb4d5d896e9add62fc3fcc4214e1de0d7