Merge "Gnss:fix NPE due to the arraymap store the null key." into main am: f902b3adf2 am: 797ea00bae

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

Change-Id: I3cb2b1fe38104a0abb890f4bedbfc448ee882cd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>