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

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



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