Merge "Remove further unused code from services/core/java/com/android/server/integrity/parser" into main