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

[automerger skipped] Merge "RESTRICT AUTOMERGE: Drop invalid data." into rvc-dev am: 60529947 am: 43304556 -s ours am: d2a0328e -s ours am: 5cb0cf9b -s ours am: 4f322f25 -s ours am: a8ccab0e -s ours am: 3c22cb47 -s ours am: e65e810f -s ours am: 86ad063e -s ours am: 9a79881d -s ours am: caba8f33 -s ours

am skip reason: subject contains skip directive

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



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