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 am: 599068d1

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



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