Merge "Fix ActivityManagerVrDisplayTests flacky"