[automerger skipped] Merge "Merge "Remove preferKeepClearAreaForFocusDelay,...

[automerger skipped] Merge "Merge "Remove preferKeepClearAreaForFocusDelay, turn it into a flag" into tm-dev am: 12a7628e am: 47c0bc92 am: 5920870d" into tm-qpr-dev-plus-aosp am: 501f8855 -s ours

am skip reason: Merged-In I0ac61e671bb75e22a95b400c9bd8d84004379e43 with SHA-1 2a6ce367 is already in history

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



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