[automerger skipped] Merge "RESTRICT AUTOMERGE Added limitations for...

[automerger skipped] Merge "RESTRICT AUTOMERGE Added limitations for attributions to handle invalid cases" into sc-dev am: 3c357c37 am: 9a3190ba -s ours am: 3a175e10 -s ours am: eb445cb6 -s ours am: 1117af97 -s ours am: 6d444c9d -s ours am: 92232417 -s ours

am skip reason: contains skip directive

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



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