Merge "mtp: add <assert.h> and <functional> includes" into main am: 0c700f93

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2759948



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