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

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

Change-Id: Ib64c5ee8b20e7ad5272537eea00f9f4f3cd1adf7