[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 sc-dev am: c5c981f5 am: 334ef9ee -s ours

am skip reason: subject contains skip directive

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



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