[automerger skipped] Merge "Address API feedbacks for networktypebitmask" am: 307f4cfeb1 am: acb14bcf46
am: 61c92a7da7 -s ours
am skip reason: change_id Idf0f88225c20fc0ed10ae4fccb705f988a3bec60 with SHA1 75b486e4c8 is in history

Change-Id: If2672f90225a113e9a471abf16ecedd92228d533