[conflict] Merge "Merge compat fake focus properties into one" into tm-qpr-dev...

[conflict] Merge "Merge compat fake focus properties into one" into tm-qpr-dev am: babb0b54 am: 18980144

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



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