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

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



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