[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 skip reason: contains skip directive

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



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