Merge "Change getEnabledComponentOverrides return type" am: 30cd5df67f am: 3374e0478a

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

Change-Id: I71b81a22256648e7f7cb38e11d54608f6ff534d5