[automerger skipped] Merge "Add per-app controls for compat fake focus" into tm-qpr-dev am: f4fa9297 am: 5b8432af -s ours

am skip reason: Merged-In Ib16084728bc0d5870c8d2effc5dd0d54bfe04d24 with SHA-1 26387cf5 is already in history

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



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