Merge "Ensure inner classes of @SystemApi classes are kept" into main