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

Change-Id: I250030427d2493463d01524d99be567a01b71e07