[automerger skipped] Merge "SurfaceControl: Add setDropInputMode api" into...

[automerger skipped] Merge "SurfaceControl: Add setDropInputMode api" into sc-v2-dev am: 348a0e6e -s ours am: 5634459d -s ours

am skip reason: Merged-In Ifcb4133306a43874e74e8fb0f42b60842daf6f25 with SHA-1 cbc4b97e is already in history

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

Change-Id: I60715c85715d2a1eef4b093f42dbbb1be98622bc