Merge "Address lint errors in aosp/2988611 & aosp/2869978" into main