[automerger skipped] Merge "SurfaceControl: Add setDropInputMode api" into rvc-dev am: 5aa3d21693 am: c3db8e7986 -s ours am: 6d94eaaffb -s ours am: 1d5e68557b -s ours
am skip reason: Merged-In Ifcb4133306a43874e74e8fb0f42b60842daf6f25 with SHA-1 a84612483f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16502615
Change-Id: Id48f49769c3794de1c578f6cb2903627b927baba
This commit is contained in: