Merge "Merge "Fix Wi-Fi level out of range crash" into tm-dev am: 8146cd00 am: 77abe668 am: 7a03942c" into tm-qpr-dev-plus-aosp am: 79a9beb7

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



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