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

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

Change-Id: Id4a9e15a146dfa7dd2fa8c9362b6a6270478fc68