[automerger skipped] Merge "DO NOT MERGE: SurfaceControlViewHost: Restrict...

[automerger skipped] Merge "DO NOT MERGE: SurfaceControlViewHost: Restrict disclosure of input token" into sc-v2-dev am: c2622879 am: ca3bd42f -s ours am: dc622e8d -s ours

am skip reason: subject contains skip directive

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



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