Merge "Check location permission for ConnDiags last." into sc-dev am: 424e2ef3aa

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

Change-Id: I7ecafab76cf840be01207b6e504e9ce0a8b579a9