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

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

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



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