Merge "Merge "Revert "Revert "Enable IMS and its config context to obtain UI component""" into rvc-dev am: 8deb612a14 am: e201638cdb am: e3dc144c0e" into rvc-qpr-dev-plus-aosp