[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: 29e8c9a1 -s ours am: fa4c7e73 -s ours

am skip reason: subject contains skip directive

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



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