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