Merge "Tweak the way to get the enabled component" into sc-v2-dev am: 21ac89fa4c am: 1c87a2e720

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

Change-Id: I5772e33a555b2bfb299d719c150095c69a27697e