[automerger skipped] Merge "SurfaceControl: Add setDropInputMode api" into sc-v2-dev-plus-aosp am: a695407744 -s ours
am skip reason: Merged-In Ifcb4133306a43874e74e8fb0f42b60842daf6f25 with SHA-1 d100067fd6 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15874412
Change-Id: If51bf73a730d2f4807424be053a4462b28f971c0
This commit is contained in: