am cda53c5d: Merge "Fixed a bug where the ConfirmDeviceCredentials activity was shown twice." into mnc-dr-dev

* commit 'cda53c5dc2c6a2c01dfd5db278a7899dd868da7d':
  Fixed a bug where the ConfirmDeviceCredentials activity was shown twice.