Merge "RESTRICT AUTOMERGE Log to detect usage of whitelistToken when sending non-PI target" into sc-dev am: c5c981f5

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



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