Merge "Fix bug where foreground activity fails to cancel auth/enrollment" into nyc-mr1-dev am: 6cb5152e am: fb5ae0ab Change-Id: Icfc434168cb3aae52f234b67f0dff087dee3a41b