Merge "Merge "Fix nullpointer exception in CompatConfig" into sc-dev am: 8bfacdf6 am: 2fd01c47" into sc-v2-dev-plus-aosp am: 90499383

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

Change-Id: I36afe1c7aa1d3df4f3ef54cc9d8c4eb7fdc7eef9