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

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

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



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