Merge "Fixed SecurityException due to Fine Location permission denied." into oc-mr1-dev am: b3aa4ab390 am: 1e0585624d am: 1c2f093d95 am: f87d7e5fc8 am: 44960f9bf0

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/13555580

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I07d3f3cc1dba0cac448dba80a55eef2bb463e9db