Merge "Add isManualNetworkSelectionAllowed api to telephonyManager" am: 0af8c5c73c
am: cc03b9b8f9

Change-Id: Ifd61aaaf868f3aeff74e6b61ef5eaaa0cd6d4578