Merge "Fix PackageManagerServiceHostTests disk usage" into rvc-dev am: f022111a13 am: 64f53c872a am: e6dbb426cc am: 6685317db2

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

Change-Id: I6f1ad07523186c7096090ac43d0a9bec0c4aa7cc