Snap for 7486544 from e265268ad81b0783832d3bb7c74d3425fcbea185 to sc-release am: 4c6ef14e0d

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

Change-Id: I159be3694be1f03f462f9ab188d5ab3a148573b4