Merge "Remove VibrationXmlParser @TestApi annotations" into main