[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix test failure caused by incorrect string" into tm-dev am: 6b0424260e am: a361b9be24 -s ours am: 74da091e71 -s ours am: 06537f66e1 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22409910 Change-Id: Ib8f80a769a6695e0ef246802b16003e4144e5fba Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: