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

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