Merge "DO NOT MERGE: SurfaceControlViewHost: Restrict disclosure of input token" into sc-v2-dev am: c2622879

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



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