tree ed4c16ce43a799443faffa3b661f50039d4ff76e
parent 1c4e17efbcd21fcddd0342b580a418c7b71f5d67
parent e6c338ce2118f1c1da2de2ef589f08287c43111d
author Bill Yi <byi@google.com> 1629244899 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1629244899 +0000

Merge changes from topic "presubmit-am-4b965ed61571430195cd51257a9aa8e6" into sc-dev-plus-aosp am: a208b04e06 am: e6c338ce21

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

Change-Id: I18d87c171523bba87d5a52945a94924c3912b9e2