Merge "Stabilize two gesture navigation tests." into stage-aosp-tm-ts-dev