Merge "Fix LocationPermissionCheckerTest" am: 9a575c6994 am: 65a71a1643

Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1637460

Change-Id: Ib093921a8c606db62e3a3821c08b9334e68c2035