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

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

Change-Id: Icf59fba3efa0a665198066c1f813746a0489d1ea