[automerger skipped] Merge "Add isManualNetworkSelectionAllowed api to telephonyManager" am: 0af8c5c73c
am: 152d71136e  -s ours

Change-Id: I279f8dd8bc474be8e0d094451cfc4346bd111984