Merge "Fix typos in ActivityManager javadocs" into main