Merge "Remove preferKeepClearAreaForFocusDelay, turn it into a flag" into tm-dev am: 12a7628e

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



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