[automerger skipped] Merge "RESTRICT AUTOMERGE Log to detect usage of...

[automerger skipped] Merge "RESTRICT AUTOMERGE Log to detect usage of whitelistToken when sending non-PI target" into udc-dev am: 7a9d05b1 am: 89da960e -s ours

am skip reason: subject contains skip directive

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



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