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

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



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