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

[automerger skipped] Merge "DO NOT MERGE: Do not hold mLock when calling GNSS HAL" into rvc-dev am: 8d4cef5e am: 10a4c91c am: b7cb8c5a am: c9d727b8 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I542149c49190a07b8446f3f825733ab33e809bd3