Merge "Merge "Revert "Set VIEW_STATE_FOCUSED only if view and window has...

Merge "Merge "Revert "Set VIEW_STATE_FOCUSED only if view and window has focus"" into udc-dev am: af7b1229 am: 80b293f4 am: 88a4e198" into udc-qpr-dev-plus-aosp am: 5f849ca7

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



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