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

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



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