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

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

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