Merge "Cleanup: make ProcessMemoryState fields final, reformat imports of ActivityMetricsLogger"