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: Iea0888e62e9b35dde6cb901154e25b5b61832267
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>