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 am: e3cbc371

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



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