Merge "Create stub and add api tracking for service-permission" into rvc-dev