[automerger skipped] Add a new NetworkType to resolver am: fa4bf6f0 am:...
[automerger skipped] Add a new NetworkType to resolver am: fa4bf6f0 am: 6fc42bbf am: f6c31356 am: b61be544 -s ours am: 24044f4f -s ours
am skip reason: Change-Id I44c3ff1ec27417a23652815edd94389a14bbd3b2 with SHA-1 44e38183 is in history
Change-Id: I674cd4f124e54df911aa310e988db69e897c76d7