Merge "New API for getting enabledcomponent" am: bca93eafe5 am: 4f564346de am: 8e6a6a255f

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

Change-Id: I24c3825547cae6a96a9ad8a5f7cbd69a32f38ad4