Merge "Add angleInUse field to 'dumpsys gpu'"