Merge "[RESTRICT AUTOMERGE] Fix test failure caused by incorrect string" into...

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

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



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