[automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891 am: 2c0e20b987 -s ours am: 80c1198a04 -s ours

am skip reason: Merged-In I4405d2bc1254fc65ff044a878ac1abd99f7ffc89 with SHA-1 09ecab8aca is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mtpd/+/16843712

Change-Id: I732aebd5bfa607510ec4405f1b3af58bb701bc6e