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: f6b7891e

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



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