[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix test failure caused by...

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix test failure caused by incorrect string" into tm-dev am: 6b042426 am: a361b9be -s ours am: 74da091e -s ours

am skip reason: subject contains skip directive

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



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