Merge "Move input surfaces into its own overlay in DisplayContent" into udc-qpr-dev am: a9d5317153 am: ce60017037

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

Change-Id: Ic60dea1c7966afbd2e1cf265c44cafd2da123cc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>