Merge "Consolidate checking of superivsion configs." into tm-dev am: 58bda6d5 am: cea5168a

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



Change-Id: Ia1d228df8022e3ec2f1ea2c1d9d18b8bfcae0fb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>