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

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



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