Merge "Cleanup background activity starts for release. am: 9e2457622a am: 2447bb6e8e" into qt-r1-dev-plus-aosp
am: 045c80c429

Change-Id: I82ff956682f193a661ab72afb485cfbe5b71351d