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

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

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



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