Merge "Add two missing operations in ActivityManagerInternal" into main