[automerger skipped] DO NOT MERGE Adjust window focusable by view controller am: b6f4a0c672 am: 9e8fd1ab79 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ia8c3f4ba324846671aa743cf09feb20c1dccb17b