[automerger skipped] Merge "RESTRICT AUTOMERGE Log to detect usage of whitelistToken when sending non-PI target" into tm-dev am: 801ba1b009 am: 8a8868373e -s ours am: 361dcbae10 -s ours am: 23c1fc2398 -s ours

am skip reason: subject contains skip directive

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

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