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

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

Change-Id: I12a2e53db097687b7a3b425400f447bed6571953
tree: 8c90993879c1c277e80a091db25fe951bf7faa48
  1. staticlibs/