[automerger skipped] Merge "RESTRICT AUTOMERGE Log to detect usage of whitelistToken when sending non-PI target" into tm-dev am: 801ba1b009 am: 0714f3b89f am: 3a9037fdae -s ours am: d46e506199 -s ours am: a40b8fe6fc -s ours am: 628111af1f -s ours

am skip reason: subject contains skip directive

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

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