Merge "Fix Wi-Fi level out of range crash" into tm-dev am: 8146cd00 am: 6c0b1e8f am: a6bcd1c6

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



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