Merge "Merge compat fake focus properties into one" into tm-qpr-dev am: babb0b54

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



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