[automerger skipped] Add a new NetworkType to resolver am: fa4bf6f0 -s ours...
[automerger skipped] Add a new NetworkType to resolver am: fa4bf6f0 -s ours am: 21cb9be0 -s ours
am skip reason: Change-Id I44c3ff1ec27417a23652815edd94389a14bbd3b2 with SHA-1 44e38183 is in history
Change-Id: I96b54f5bd9d54f850fe14f6b2ae3f499cd0ef902