Merge "Allow MANAGE_TEST_NETWORKS to register limited agents" am: 9cbc17d75e am: 2c129e97cc

Change-Id: Ia0f76216636ae11d1d9cbea5ed6ff0ee4e2a3f5b