Merge "Improve SearchView & secondary text accessibility" into tm-dev am: 9df49914 am: 88f317ab

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



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