[automerger skipped] Merge "Remove preferKeepClearAreaForFocusDelay, turn it into a flag" into tm-dev am: 12a7628e am: c3f7c806 -s ours am: 4edd80ef -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: I95f640d17abb3a9e1b0589d58dca935544110476
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>