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

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

Change-Id: I3619d8dbabfa357174293b2b496968b3bf7d2e44
tree: 11faaffd06d4756505f0e4b830d72df87a0f0578
  1. staticlibs/