Snap for 8604704 from 8e30902c76441d642b41c57fcb6d750482a20350 to tm-release am: adea9ecfab

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

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