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

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



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