Merge "Reduce flakiness of testForceStopPackageWontRestartProcess" into stage-aosp-rvc-ts-dev