[automerger skipped] Merge "Mark NonNull for canManageSubscription...
[automerger skipped] Merge "Mark NonNull for canManageSubscription parameters." am: ae4ad59c am: de3b8282 -s ours
am skip reason: Change-Id I56dc7576c9b44337f0b61164a5cd434d17601ccb with SHA-1 277a5516 is in history
Change-Id: Ib222d4aebe2455d87a757a0b182090678d609999