Merge "Fix Wi-Fi level out of range crash" into tm-dev am: 8146cd00 am: 77abe668

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



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