Merge "Fix bug where foreground activity fails to cancel auth/enrollment" into nyc-mr1-dev am: 6cb5152e9f am: fb5ae0abff
am: 308c517a56

Change-Id: I8e3d5bc5aba23c85bfff1e150c247c1eea0d6be8