[automerger skipped] [automerge] Renamed OpportunisticNetwork.KEY_ENTRY_THRESHOLD_SS_RSRP_INT 2p: 45afce1c49 am: 3c47495e54 -s ours

am skip reason: Merged-In I03acd1139f8d660b5d40d3a873bf9e0dbf10ab4e with SHA-1 9ab3a0ad7b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/16933257

Change-Id: I03e0333c683ca8fb64ae43c5eea184fc984cda88