Merge "Fix signal threshold boundaries for NR" am: 865dcdbf am: 76a96802 am: 89c5ba14 am: 92d7217f am: 299a95ed

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



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