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

Change-Id: Id15be629bc83bc2448d56dbb7b59d7353f28824c