Merge "DO NOT MERGE Adjust window focusable by view controller" into rvc-qpr-dev am: c8002f8e4c

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

Change-Id: I037d74b04980b02452b78aa86a62de1fd338b67d