[automerger skipped] Merge "DO NOT MERGE Adjust window focusable by view...

[automerger skipped] Merge "DO NOT MERGE Adjust window focusable by view controller" into rvc-qpr-dev am: c8002f8e am: a56ea380 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I1e2d51251f30268bc43665bbad381a0b0bdb5933