[automerger skipped] Merge "Move DhcpInfoTest to frameworks/base/tests/net/common" into rvc-dev am: 3d66e42610 -s ours am: 6001174c97 -s ours am: 9db2744107 -s ours am: 86ced28af6 -s ours
am skip reason: Change-Id I42a965ae5cb748fdd80b4d5c0f8b26f36f74be72 with SHA-1 b124dcff2c is in history
Change-Id: Iaa36ee07b8f54d9a36ec4cb80c0d336a87a312d9
This commit is contained in: