Merge "Allow vndservicemanager to self-register." am: 48eed15c35

Change-Id: I29a24050637dd352139a5aed75ce0567abb962a8