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