[automerger skipped] Merge "Add support for registering test networks with administrators." into rvc-dev am: d95e6de42f -s ours am: 1ae67980c2 -s ours
am skip reason: Change-Id I7a443c368cf1ac470fbe40883ca24bc3143153b0 with SHA-1 539cd36a1d is in history
Change-Id: Idf2b13a076c0025d4a4dbf2d202ba953573d3651
This commit is contained in: