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

[automerger skipped] Merge "SurfaceControl: Add setDropInputMode api" into rvc-dev am: 5aa3d216 am: c3db8e79 -s ours am: 6d94eaaf -s ours am: a5a7ce9f -s ours am: 420e6d5a -s ours

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

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

Change-Id: Iad875455da1bdab86288a5d73f7cc66e23a34ebb