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

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



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