Merge "RESTRICT AUTOMERGE Log to detect usage of whitelistToken when sending non-PI target" into tm-dev am: 801ba1b009 am: 0714f3b89f

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

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