Merge "Handle null pointer in LohsSoftApTracker" into udc-mainline-prod am: 39879446e7

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Wifi/+/24907050

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