Merge "Fix -Wdefaulted-function-deleted warnings." am: d74da324d7 am: 34b7973fba

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2176531

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