[automerger skipped] DO NOT MERGE ANYWHERE Ignore failing test am: 3ffaae13...

[automerger skipped] DO NOT MERGE ANYWHERE Ignore failing test am: 3ffaae13 -s ours am: 1181eb6f -s ours am: 602fca1f -s ours am: c67d6743 -s ours am: a560b778 -s ours am: 99a73e53 -s ours am: 65d30cfb -s ours am: 4fe6a150 -s ours am: baa42fe2 -s ours

am skip reason: contains skip directive

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



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