Merge "Merge "[automerger skipped] Merge "DO NOT MERGE Use view coordinate to scroll edit text (cherry picked from master branch)" into oreo-mr1-cts-dev am: 44fdd395df -s ours am: a4763a7bd9 -s ours am skip reason: subject contains skip directive"