Merge "Merge "Don't rely on intent to call back from activity tracker" into sc-dev am: 1b369c4763 am: f620e72ad6" into sc-v2-dev-plus-aosp