Merge "Include SDK sandbox while calculating app and user size" am: 7c19119184 am: cfe1746477

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

Change-Id: Id8b2c36da571b9a152deefdf05827fd9787ee34e