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

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



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