Merge "Specify the component for the ACTION_SHOW_ECM_EXIT_DIALOG Intent" into rvc-dev am: 160c24aade

Change-Id: I58eb3560a30e4164e0d6fa3284b502976fae7584