Merge "Mark NonNull for canManageSubscription parameters." into rvc-dev am: 5f3331df am: f402732e Change-Id: I9c719d969b14972c467ec16c7e6d7b8e43eecbfb