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

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

Change-Id: I7751b1327f63aa49cdf413b3c1b03555551381bf