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

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

Change-Id: Icfb0808c72c573d51f4ca16c477bb7b903a9cb20