Merge "Add ByteResult.unitsContentDescription field" into main am: 5a8ff9e008

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3067182

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