Merge "MTP: fix a memory leak" into sc-dev am: a66b67936f

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

Change-Id: Ie7c18686eb4ea81eb81ebea4301eaa6f401bf36e