Merge "Improve SearchView & secondary text accessibility" into...

Merge "Improve SearchView & secondary text accessibility" into tm-dev-plus-aosp am: e29e536b am: 5ab3ad9a

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



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