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

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

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



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