[automerger skipped] Merge "Added API on PhoneInterfaceManager for updating fplmn" am: 8439d91e90 am: e9b70bfbf2 am: 00cbfbef1e
am: 8beeda0a93 -s ours
am skip reason: change_id I6f986008d7f868a28d5d9797fe1f4d5b670d3d1a with SHA1 2737e88a7d is in history

Change-Id: Ia8f01fc8f97652c6d23ab23fcba9107436831092