Merge "Enforce activity lifecycle not affected by authentication APIs" into rvc-dev am: 69d6882c81 am: 4e4fd1a954 am: 4c916b6637 am: 2c360ff059 am: eae1a3916f

Change-Id: I0619c6b9d0ba807a0005985748695011ac4c9ab8