tree c1afc48355ca089e5321120aa3f6ba76544ff11e
parent 1efd4cfced69307a921b0b83baefeafa2ca076cb
parent de3b82822306b9fb9ccb684bcdff400f324dbfd1
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1584057951 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1584057951 +0000

[automerger skipped] Merge "Mark NonNull for canManageSubscription parameters." am: ae4ad59cb6 am: de3b828223 -s ours

am skip reason: Change-Id I56dc7576c9b44337f0b61164a5cd434d17601ccb with SHA-1 277a551652 is in history

Change-Id: Ib222d4aebe2455d87a757a0b182090678d609999