tree 280d7e46e0eef0dd28e1fdf2d70624d154048acc
parent d4a830a2f8ecbc7c8d7daf79ef2b13dde69bec85
parent e66c1f7e5c9583de0bd97c3a1329ac74407f30ca
author Nathan Harold <nharold@google.com> 1602009319 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1602009319 +0000

[automerger skipped] Merge "[BACKPORT] Improve location checks in TelephonyRegistry" into rvc-dev am: 21a1916717 am: c96eba62ae am: 9a34dd689c am: e66c1f7e5c -s ours

am skip reason: Change-Id I8caa3ea409836ce8469d8d8210b481a0284594f2 with SHA-1 cc584e777d is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11589690

Change-Id: Idb51634ab5e3e490ac6aeb5b23d14558ccea0cee