Merge "Fix insert mode draws extra rectangle at the end of the first line"...

Merge "Fix insert mode draws extra rectangle at the end of the first line" into udc-dev am: 4a0f969c am: 20aec8b8

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22517562



Change-Id: Iccacc70d5a61c5e3b07dc52b75f69c54ac6101b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>