tree 5855548d491d4ee64342e29417f530c0655c414a
parent d6f76e0081a48650e1aa8ad0c4d8c08fbd9cef5d
parent cd486c06d03efd4cfd045d4b05da752a71aafefe
author Weng Su <wengsu@google.com> 1670854037 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1670854037 +0000

Merge "fix WifiUtils:isNetworkLockedDown() null pointer issue" am: 956f288d1d am: ee773103f8 am: cd486c06d0

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2334743

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