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

Change-Id: Ia9a15664af35ec2ad0c1e612925a139597fa0b2a