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

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



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