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

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