Merge "Removing SystemApi added in aosp/2685327" into main