Merge "Fix cursor not blinking when view re-added to layout" am: 8412b132 am: 9f93d022

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



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