[automerger skipped] Merge "Added support to calculate storage using project ids on devices whose user data is wiped and their add directories are created using project id Bug: b/215154615 Test: atest StorageHostTest Test: atest tests/installd_service_test.cpp Change-Id: Ib29af7c4c0e80d5b8902899b38de41a807e1cd72 Merged-In: Idfe262d5606a4f577587e75e4a29fdb55c021a37" am: adb5da5fbb am: f927136f5e am: 975bc5c480 -s ours

am skip reason: Merged-In Idfe262d5606a4f577587e75e4a29fdb55c021a37 with SHA-1 976ae000b0 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1947567

Change-Id: I0b55abe9de2f857a542ad1356b364f75d0aa9563