[automerger skipped] Merge "RESTRICT AUTOMERGE: Drop invalid data." into...

[automerger skipped] Merge "RESTRICT AUTOMERGE: Drop invalid data." into tm-dev am: b817c5e2 -s ours am: 9cfa634e -s ours am: e8960583 -s ours am: 981a4dcd -s ours am: cb4170d5 -s ours am: 6c7dd8e6 -s ours

am skip reason: subject contains skip directive

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



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