Merge "Merge "Revert "Revert "Enable IMS and its config context to obtain UI component""" into rvc-dev am: 8deb612a am: e201638c" into rvc-d1-dev-plus-aosp