Merge "Fix toolbar announce wrong text." into tm-qpr-dev am: 3292a30a am: ff672bc4

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



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