[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix test failure caused by incorrect string" into tm-dev am: 6b042426 am: 2cbc7777 am: e3cbc371 am: 23c1924d -s ours am: a67d2009 -s ours

am skip reason: subject contains skip directive

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



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