[automerger skipped] Merge "API review: setNetworkSelectionModeManual" am: a0e42af0 am: 631f893c -s ours
am skip reason: Change-Id I140477b2778158646dbbcb0d2a32033c61bb97e4 with SHA-1 1f39ebd9 is in history
Change-Id: I2d3daab87164d77bf6d9e4cc4e52ae7ae485454a