Merge "Mark NonNull for canManageSubscription parameters." am: ae4ad59cb6

Change-Id: I1520a4e630f49bdeaeccff1ff0165407ae899934