[automerger skipped] Merge "Allow GSM RSSI levels to be customized by CarrierConfig" am: 5ab0dd0aa0
am: b71dc1e65d -s ours
am skip reason: change_id I61afd1f07564c0df886b0e30d27ea2a059b484dc with SHA1 186a87b003 is in history

Change-Id: I9467b72216c37c325d796d4cbb9e16dd5376bab3