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

Change-Id: Idcbe8d4b24c30d4f2699ce7423b1234b6391b0b0