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

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

Change-Id: I6f6c146f5ccf98c2d63b5d49e9478eac9922c697