[automerger skipped] Merge "Add support for registering test networks with administrators." into rvc-dev am: fffee665 am: 2d68d46e -s ours am: 3dd3e620 -s ours am: dec74709 -s ours

am skip reason: Change-Id I7a443c368cf1ac470fbe40883ca24bc3143153b0 with SHA-1 beb34da4 is in history

Change-Id: Ib38f02ecff80d6e353617e15220c7b33220a218f