Merge "Add ability to finish() ConfirmDeviceCredential if it loses foreground...
Merge "Add ability to finish() ConfirmDeviceCredential if it loses foreground am: e27a304b am: 10fe104f" into qt-qpr1-dev-plus-aosp
am: c7c8efed
Change-Id: I3784ec4e6911a76ed1096dc1921facc1e1bcb3af