[automerger skipped] DO NOT MERGE: Do not hold mLock when calling GNSS HAL am:...

[automerger skipped] DO NOT MERGE: Do not hold mLock when calling GNSS HAL am: 5a0a1d95 am: 42403eb0 am: 7b5ef4bd am: 2461667b -s ours

am skip reason: subject contains skip directive

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

Change-Id: I750cd8bee5b782170d11a3c9ddfd5213c809ae82