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

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

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