[automerger skipped] Merge "Fix cursor not blinking when view re-added to...

[automerger skipped] Merge "Fix cursor not blinking when view re-added to layout" into udc-dev am: 1aaa44d3 -s ours am: 585164b0 -s ours

am skip reason: Merged-In I07afc7ef1a707549240479015a00a66db814afb7 with SHA-1 61d98288 is already in history

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



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