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

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

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



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