Mark ab/6881855 as merged am: fa405a436a am: 1361c744d7

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Mtp/+/13112994

Change-Id: I3ce2ffb578fc670e389d772ebc177794da3d10e3