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: I2a43a0db9ccc3a3cf3da7b7cf484f86380a6ed58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>