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

Change-Id: I4bda7cebfa9be4becd84d0e42cd9d222e6d063d0