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

[automerger skipped] Merge "RESTRICT AUTOMERGE Added limitations for attributions to handle invalid cases" into tm-dev am: e64b8b6e am: df28c1a9 -s ours am: d46be3a9 -s ours am: 1d7c9a82 -s ours am: 5e61814a -s ours

am skip reason: contains skip directive

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



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