[automerger skipped] Merge "Add configurable RSRP boost for 5G NR SA." am: 7405010f am: 3e928bfd -s ours am: 59dab0cd -s ours

am skip reason: Merged-In Ic6becca786e5f039194ffb48ca572ff1ab7ce305 with SHA-1 ae5f04d4 is already in history

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

Change-Id: I485c46cb70be1a087a5aa779fd22ab219299ccf3