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 am: 8a726c04

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

Change-Id: I5ed3de75b04f6e865f53f86f8589b46d984ad4d9