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

[automerger skipped] Merge "Include SDK sandbox while calculating app and user size" into tm-dev am: 3b7c2c61 -s ours

am skip reason: skipped by user sanjanasunil

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

Change-Id: I079439a4634e076d28cf33894e1f4d0f6a186795