[automerger skipped] Merge "Drop invalid data." into tm-qpr-dev am: 99f65269 -s ours

am skip reason: Merged-In Ie817aa0993e9046cb313a750d2323cadc8c1ef15 with SHA-1 68686110 is already in history

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



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