Merge "Fix PackagePartitions contains null check" into rvc-dev am: ca4709a9a5 am: 26c2956206 am: c27c0e20e9

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

Change-Id: Icb684771082333cef1beb5fcaf35cd1fb8b4ae1c