Merge "Add None into cancelPendingUssd" into oreo-vts-dev