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

Change-Id: Ic2da56957495ab6ebbb51ed10999a526b445e288