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: e3b85ee5

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



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