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

Change-Id: Iae245cedd050379b6aad1f807e3d9b71dca221c3