[automerger skipped] [automerge] DO NOT MERGE: SurfaceControlViewHost:...

[automerger skipped] [automerge] DO NOT MERGE: SurfaceControlViewHost: Restrict disclosure of input token 2p: 0cfda55b am: 18bd9876 -s ours am: b7e0e7b7 -s ours am: 6b1f5f71 -s ours am: 3e7042bc -s ours

am skip reason: subject contains skip directive

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



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