[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: 91fbd0c0 am: 3a418e8a -s ours

am skip reason: subject contains skip directive

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

Change-Id: I921e9a400efdeec6ea9675af5e148ece3625bce8