[automerger skipped] Merge "Add configurable RSRP boost for 5G NR SA." am:...

[automerger skipped] Merge "Add configurable RSRP boost for 5G NR SA." am: 8942680b am: f3807491 -s ours

am skip reason: Merged-In Ie894b063db5881736bd55d4703fde742d2325c77 with SHA-1 61fd42fa is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1752800

Change-Id: I0e7a8d3eef8043636681aa102f7ffdf01ceae778