Merge "Revert "Apexd logs metrics atoms for rebootless installs"" into main