am c77839e0: am aee6e41e: Merge "Finish trampoline activity for ConfirmDeviceCredential immediately" into mnc-dr-dev

* commit 'c77839e0e12aaa656a65d5c3ff6da33cb0a76d46':
  Finish trampoline activity for ConfirmDeviceCredential immediately