Merge "Merge "Apply RangeBuilder amination for media transferring" into...

Merge "Merge "Apply RangeBuilder amination for media transferring" into rvc-dev am: 359d3ac8 am: 0022d19d" into rvc-d1-dev-plus-aosp am: dc4e43c9

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/10987459

Change-Id: Iedcb9fd181a5b85a4f7cca137e9cb4ed3d108563