[automerger skipped] Merge "RESTRICT AUTOMERGE Log to detect usage of whitelistToken when sending non-PI target" into sc-dev am: c5c981f56c am: 334ef9ee23 -s ours am: 5aa1eb95fd -s ours am: 76e7c0b7cb -s ours am: 88852f7ee7 -s ours am: 020958ae0c -s ours

am skip reason: subject contains skip directive

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

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