[automerger skipped] Merge "RESTRICT AUTOMERGE: Drop invalid data." into sc-dev am: 976b1f8c2e -s ours

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

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

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