Merge "Merge "Improve SearchView & secondary text accessibility" into tm-dev...

Merge "Merge "Improve SearchView & secondary text accessibility" into tm-dev am: 9df49914 am: eb3241f5" into tm-d1-dev-plus-aosp am: 7ffb87e6

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



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