Merge "Added support to calculate storage using project ids on devices whose...

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" into tm-dev am: 092400a9

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

Change-Id: I8bb756b990a0081d829b50c16832246016210a9a