Merge "Fix CTS failure ActivityManagerTest.testKillingPidsOnImperceptible"