Merge "Reduce flakiness of a11y testTextEditingActions" into oc-dev am: 58838df1d0
am: 93f10f5b79

Change-Id: Ib00f8703bfa9afddf5c8af2aae43f4218a8e4dc2