Merge "Revert too strcit assertion in ActivityManagerTest"