Merge "[RESTRICT AUTOMERGE] Fix test failure caused by incorrect string" into tm-dev am: 6b0424260e

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

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