Merge "[automerger skipped] Merge "API review: setNetworkSelectionModeManual" am: a0e42af0 am: 631f893c -s ours" into rvc-dev-plus-aosp am: 0f22f1b8 -s ours am: 800886f6 -s ours

am skip reason: Change-Id I140477b2778158646dbbcb0d2a32033c61bb97e4 with SHA-1 1f39ebd9 is in history

Change-Id: If71fe658a14e27f2cf362c877160cbb46a4cdef1