Merge "Reland "Don't use framework strings for formatting file sizes"" am:...

Merge "Reland "Don't use framework strings for formatting file sizes"" am: ba69fd0d am: d5ab7dc7 am: 5aada332 am: 330934cf am: 200c45a9

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



Change-Id: Ic945ada7d520a4ec53dccef4e30918f140cb63cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>