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

Change-Id: I485d07482b1968daf1b8c7598c2156c20d0bed86