[automerger skipped] Merge "Include SDK sandbox while calculating app and user...

[automerger skipped] Merge "Include SDK sandbox while calculating app and user size" am: 7c191191 am: cfe17464 am: 3a970739 -s ours

am skip reason: Merged-In I94bc30f7e47e06b3b60d28f16a647a2a0daaae93 with SHA-1 08c0ff36 is already in history

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

Change-Id: I310c872896459c21788d5e0fd5c2557026aa0516