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

Merge "Revert "Set VIEW_STATE_FOCUSED only if view and window has focus"" into udc-dev am: af7b1229 am: 80b293f4 am: eab17351 am: d64d310a

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



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