Merge "Fix accessibility navigation on search bar selection" into udc-qpr-dev am: 0ea52b6b8b am: 8c3ef35b51

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

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