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

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



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