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

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

Change-Id: Iec25dcfff547601a2378ba0026c30b5454e72294