Merge "Merge "Add None into cancelPendingUssd" into oreo-vts-dev am: 4ccc3b0140 am: 630eb2d3b8 am: f447fd054d" into oc-mr1-dev