[automerger skipped] Merge Android U (ab/10368041) am: 8ce3637ae6 -s ours am: a248980060 -s ours

am skip reason: Merged-In I4a89f2c1bf6c74d85ba04ebd7f8c94caa51f3ebb with SHA-1 0cbd1a60aa is already in history

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

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