Merge "Fix flaky test ActivityManagerAppExitInfoTest#testSecondaryUser" into rvc-dev