[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 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/+/20064768



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