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