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

Change-Id: I0bfb27fd815a257221d8b443eee73b3c4bf54cf4