Merge "Finish trampoline activity for ConfirmDeviceCredential immediately" into mnc-dr-dev