[conflict] Merge "Include SDK sandbox while calculating app and user size"...

[conflict] Merge "Include SDK sandbox while calculating app and user size" into tm-dev am: 3b7c2c61 am: df6b7bd3

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

Change-Id: Iddf4b7726407c92d76ef0a0e2c3ff03a84a97557