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

Merge "Merge "Consolidate checking of superivsion configs." into tm-dev am: 58bda6d5 am: 3099215b am: e432522c" into tm-qpr-dev-plus-aosp am: 801ede57

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



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